Set the default BABL_PATH based on the prefix babl is compiled for.

	* babl/Makefile.am:
	* babl/babl-extension.c:

diff --git a/ChangeLog b/ChangeLog
index 30f1f059ee70b987db3715a1551e3ccdd76daf04..305f633232808545485e6f645f5cb47bc1abd952 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-11-15  Øyvind Kolås  <pippin@gimp.org>
+
+       Set the default BABL_PATH based on the prefix babl is compiled for.
+
+       * babl/Makefile.am:
+       * babl/babl-extension.c:
+
 2006-11-07  Øyvind Kolås  <pippin@gimp.org>
 
        * extensions/CIE-Lab.c: (formats): added "CIE Lab alpha float" as

diff --git a/babl/Makefile.am b/babl/Makefile.am
index ffc0338f2011cd4f83d6609a52aea213e08b0541..81b28f942650ef2e134a413bfb45fcd6ab0ed475 100644 (file)
--- a/babl/Makefile.am
+++ b/babl/Makefile.am
@@ -46,6 +46,8 @@ library_include_HEADERS =             \
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/babl/base
 
+AM_CPPFLAGS = -DPREFIX=\""$(prefix)"\"
+
 lib_LTLIBRARIES= libbabl.la
 libbabl_la_SOURCES= $(h_sources) $(c_sources)
 libbabl_la_LIBADD=\

diff --git a/babl/babl-extension.c b/babl/babl-extension.c
index 2352586e80d3214f029acbc4e8659b9fa626e8e9..812e4050ca4a580d03d87a22d201d7a176b23594 100644 (file)
--- a/babl/babl-extension.c
+++ b/babl/babl-extension.c
@@ -22,7 +22,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #else
-#define BABL_PATH           "~/.babl-0.0:/usr/local/lib/babl-0.0:/usr/lib/babl-0.0";
+#define BABL_PATH           PREFIX "/babl-0.0"
 #define BABL_PATH_SEPERATOR "/"
 #define BABL_LIST_SEPERATOR ':'
 #endif